Merge commit 'wd/master'
authorJon Loeliger <[email protected]>
Wed, 13 Feb 2008 22:03:20 +0000 (16:03 -0600)
committerJon Loeliger <[email protected]>
Wed, 13 Feb 2008 22:03:20 +0000 (16:03 -0600)

Trivial merge